Get basic chatbot web gui working in llamafiler

Author: jart

llamafile/flags.cpp

@@ -20,6 +20,7 @@
 #include "llamafile.h"
 #include "trust.h"
 
+#include <cosmo.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -49,7 +50,8 @@ const char *FLAG_ip_header = nullptr;
 const char *FLAG_listen = "0.0.0.0:8080";
 const char *FLAG_model = nullptr;
 const char *FLAG_prompt = nullptr;
-const char *FLAG_url_prefix = nullptr;
+const char *FLAG_url_prefix = "";
+const char *FLAG_www_root = "/zip/www";
 double FLAG_token_rate = 1;
 float FLAG_temp = 0.8;
 int FLAG_batch = 2048;
@@ -140,13 +142,6 @@ void llamafile_get_flags(int argc, char **argv) {
             continue;
         }
 
-        if (!strcmp(flag, "--url-prefix")) {
-            if (i == argc)
-                missing("--url-prefix");
-            FLAG_url_prefix = argv[i++];
-            continue;
-        }
-
         if (!strcmp(flag, "-k") || !strcmp(flag, "--keepalive")) {
             if (i == argc)
                 missing("--keepalive");
@@ -219,6 +214,28 @@ void llamafile_get_flags(int argc, char **argv) {
         //////////////////////////////////////////////////////////////////////
         // http server flags
 
+        if (!strcmp(flag, "--www-root")) {
+            if (i == argc)
+                missing("--www-root");
+            FLAG_www_root = argv[i++];
+            continue;
+        }
+
+        if (!strcmp(flag, "--url-prefix")) {
+            if (i == argc)
+                missing("--url-prefix");
+            FLAG_url_prefix = argv[i++];
+            if (!IsAcceptablePath(FLAG_url_prefix, -1)) {
+                tinyprint(2, "error: --url-prefix must not have // or /. or /./ or /../\n", NULL);
+                exit(1);
+            }
+            if (endswith(FLAG_url_prefix, "/")) {
+                tinyprint(2, "error: --url-prefix must not be slash or end with slash\n", NULL);
+                exit(1);
+            }
+            continue;
+        }
+
         if (!strcmp(flag, "--http-ibuf-size")) {
             if (i == argc)
                 missing("--http-ibuf-size");

llamafile/llamafile.h

@@ -26,6 +26,7 @@ extern const char *FLAG_listen;
 extern const char *FLAG_model;
 extern const char *FLAG_prompt;
 extern const char *FLAG_url_prefix;
+extern const char *FLAG_www_root;
 extern double FLAG_token_rate;
 extern float FLAG_temp;
 extern int FLAG_batch;

llamafile/server/BUILD.mk

@@ -8,6 +8,7 @@ LLAMAFILE_SERVER_HDRS = $(filter %.h,$(LLAMAFILE_SERVER_FILES))
 LLAMAFILE_SERVER_INCS = $(filter %.inc,$(LLAMAFILE_SERVER_FILES))
 LLAMAFILE_SERVER_SRCS = $(filter %.cpp,$(LLAMAFILE_SERVER_FILES))
 LLAMAFILE_SERVER_OBJS = $(LLAMAFILE_SERVER_SRCS:%.cpp=o/$(MODE)/%.o)
+LLAMAFILE_SERVER_ASSETS = $(wildcard llamafile/server/www/*)
 
 $(LLAMAFILE_SERVER_OBJS): private CCFLAGS += -g
 
@@ -22,6 +23,11 @@ o/$(MODE)/llamafile/server/main:				\
 		o/$(MODE)/llama.cpp/llava/llava.a		\
 		o/$(MODE)/double-conversion/double-conversion.a	\
 		o/$(MODE)/stb/stb.a				\
+		$(LLAMAFILE_SERVER_ASSETS:%=o/$(MODE)/%.zip.o)
+
+# turn /zip/llamafile/server/www/...
+# into /zip/www/...
+$(LLAMAFILE_SERVER_ASSETS:%=o/$(MODE)/%.zip.o): private ZIPOBJ_FLAGS += -C2
 
 $(LLAMAFILE_SERVER_OBJS): llamafile/server/BUILD.mk
 

llamafile/server/cleanup.cpp

@@ -17,10 +17,17 @@
 
 #include "cleanup.h"
 
+#include <unistd.h>
 #include <vector>
 
 #include "llama.cpp/llama.h"
 
+void
+cleanup_fildes(void* arg)
+{
+    close((intptr_t)arg);
+}
+
 void
 cleanup_float_vector(void* arg)
 {

llamafile/server/cleanup.h

@@ -17,6 +17,9 @@
 
 #pragma once
 
+void
+cleanup_fildes(void*);
+
 void
 cleanup_float_vector(void*);